Bug 918864. r=bz
Automatic merge