[ros-dev] Patch to bug #2517