[ros-diffs] [jgardou] 48547: Sync with trunk (r48545)