Fix catkin_make invocation
1.0.24
Merge 1.0.24
1.0.24-1