Add changes from hg source tree