Merge pull request #1267 from spevans/pr_nsstring_test_fix_4_0