Merge "Changed handling of uniforms of arrays of structs" into devel/master