Merge branch 'multitouch' into device-groups