Transfer newline fix to master file