[CLEANUP] - Automatic buildguy push causes line-endings to break again.
Merge pull request #496 from tmorgner/master

[CLEANUP] - Automatic buildguy push causes line-endings to break again.