Merge "Fixed bug in 3x3 NPatch shader and Color visual shader" into devel/master