Merge pull request #268 from ros2/master