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