Merged in public_messages changes from branch encoder_and_motor.