Merge branch 'groovy-devel' of github.com:ros-planning/moveit_pr2 into groovy-devel
Merge branch 'groovy-devel' of github.com:ros-planning/moveit_pr2 into groovy-devel