Merge pull request #2767 from alarcher/libxcb-112