Sync changes from Hg