bug 963686 - beagle 1.3t branch. r=hwine