Merge bug25494 (again, after unmerging bug25517)