Merging master into ual_parallel_grippers