Moved to different mercurial repository, merged changes