Merge pull request #1261 from spevans/pr_nslocktest_fix