Merge fix for bug 1025729 from yet-to-be-released NSS update.