Merge "Fix Bitmap.cpp line endings"