Oops, forgot to add
Merge bug 26239 (again)