Merge pull request #1238 from andymckay/909801-three

yes > varies (bug 909801-three)
Removed d2c waffle flags (bug 823702)
make a testing tab (bug 923307)