[ros-diffs] [gvg] 18440: Merge from trunk. tsk <tsk_n@mail.goo.ne.jp>: