Merged 3dMouse into master. (without merge tool).