Fix for npi namespace issues found in 4.0.1-RC1.
Merge pull request #447 from msweaver/4.0_integration

Fix for npi namespace issues found in 4.0.1-RC1.