Patched catkin to do the Right Thing (TM).