Sync with XS's mercurial repo