Merge "Supports cube map images in scene-loader" into devel/master