[ros-diffs] [tkreuzer] 36845: sync to trunk revision 36100