Delete .hgignore
Merge branch 'master' into myChanges
Cleanup