Merge "Added test for UniformBlocks" into devel/master