Rebase from 'upstream' @ version '1.3.29'
remove catkin dep