Bug 975695, r=khuey.
Bug 934142, remove faulty assertion. r=khuey.
Automatic merge