Merge "Make broken alpha mask image show image" into devel/master