Merge branch 'master' into clone_less
hgtool expects dirname for cwd
Merge branch 'clone_less' into clone_less-dev