Merge branch 'jc/maint-blank-at-eof' into jch