Merged commit 9afd0bd from BigBadOwl.

Note that I made the DibToBitmap class private.