Merge remote-tracking branch 'origin/NCover' into NCover
Merge branch 'NCover'