Merge branch 'tz/notes-error-to-stderr' into maint