Pulling in changes from catkin