[ros-diffs] [gvg] 18658: Merge from trunk. Martijn Vernooij <o112w8r02@sneakemail.com>