Bring Box2d support to master.