Merged with hg-origin.
Merge branch 'master' into issue90