Bug 928268 - Avoid bogus assert, r=jandem.
Automatic merge