Merge "Added element_count for sampler uniform arrays." into devel/master