bug 898714 - land mercurial changes from beagle branch. r=rail