Merge "Changed image loaders to use new PixelBuffer class." into devel/master