Merging changes from ROS-Industrial to master.