Fix crash.
Merge branch 'robert' into mouse_controls_swapped