Fix my last screwed up commit
Merge branch 'respect_final_eol_preference'