Merge branch 'gb/maint-am-patch-format-error-message'