Merge branch 'psmouse' into next