Merge branch 'master' into version_0.71
Embedded bitmaps into source