[ros-diffs] [tkreuzer] 36846: sync to trunk revision 36500