Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb