Issue 284

Implements #284, example: https://github.com/ros/rosdistro/pull/4733