Merge pull request #2766 from alarcher/xcbproto-112