manual merge from SVN trunk
sawControllers: teleop, only set MTM position when Slave has moved