Merge "Enabled sampler arrays in shader" into devel/master