Merge remote-tracking branch 'origin/trunk-tracking' into jefftk-better-error-message