bec99bffee
Merge commit '5c536e9162721c460699a041959a0d67de1d20db' * commit '5c536e9162721c460699a041959a0d67de1d20db': Fix issue where scaled bitmap sizes could be wrong.