Fixed NSS 3.15 errors.
Merge pull request #582 from Jookia/nss-3.15

Fixed NSS 3.15 errors.