How could I forget this
Merge branch 'master' into bitmaps
Line Ending nonsense