Merge branch 'master' of https://github.com/RobotLocomotion/drake; branch 'master' of https://github.com/RobotLocomotion/drake-private