Sync with trunk (aka 'I want my virtualbox mouse integration too')