[ros-diffs] [royce] 14319: patch by Filip Navara: