Merging RobotLocomotion/drake master