Merge remote-tracking branch 'wking/keep-trailing-newline'