[ros-diffs] [amunger] 17216: Merge bug 659 fix into 0.2.7 branch.