Merge branch 'wayland'

This has one regression: the basic touch support added by
Carlos Garnacho in 991c85f6 is now partially reverted, since
we ported to Clutter events for this. We'll need to either
port his changes to Clutter, or restructure event handling
in mutter directly.