Manually merge changes from 8a6fe3 (for multi-touch)
Manually merge changes from 8a6fe3 (for multi-touch)

dylans/dgrid,kfranqueiro/dgrid,dylans/dgrid,maier49/dgrid,kfranqueiro/dgrid,maier49/dgrid,dylans/dgrid,kfranqueiro/dgrid,maier49/dgrid