Merge pull request #3940 from akoeplinger/deprecate-nunit