Merge "Masking support for external textures" into devel/master