catkin cleanup
Merge branch 'catkinize' into experimental