Merge "Fix bug in TextureSet" into devel/master