changes from nunit2
Merge branch 'martinmcwhorter-master'