Bug 1002426 - Check restore status before overriding zoom. r=kats
Bug 1005652 - Replace a free with a delete in nptest.cpp to fix a minor warning found by scan-build, the LLVM/Clang static analyzer. r=bsmedberg