sync from scmtools.git