Sync from hg (make customization easier)