Comment 8 for bug 778989

Since Kathy and Chris suggested in IRC this was to be a bug fix, targeting to appropriate new milestones and pushing to supported release series rel_2_7 and rel_2_6 as well as master.

Thanks all, and set!