Bug 850492. r=rstrong.
Bug 854088. r=rstrong.