Merge "Check if number of textures match active samplers" into devel/master