Merge branch 'master' of git://anongit.freedesktop.org/git/xcb/libxcb