Comment 14 for bug 1466926

Thanks Tobias for all the tests.

With all that prep done I'll try to push it to SRU review now.