Merge "Don't pre-multiply on external images." into devel/master