Adding stable branch
Merging rev fab15a13e3ba into stable
Removing hgignore file
Merge branch 'stable'
Removing .hgignore, fixing conflict