enhanced error message about notes
Merge remote-tracking branch 'upstream/master'