Oops
merge bug25678 into default (again)