Code

Merge branch 'jc/apply-blank-at-eof-fix'