Move to XCB; Fix a mem/resource leak
Merge remote-tracking branch 'upstream/master' into conf