Merge "Fix the shaders for skybox rendering" into devel/master