Merge "Fixing bug with changing a shader on a renderer" into devel/master