Support for extra mouse buttons
Merge branch 'master' into swrenderer