merge from hg
update for git-setup
merge from hg