Merge branch 'master' into breakthrough/followingRuiIdeaForExtensibility

Conflicts:
	NFluent/Check.cs
Finishes the merge/rebase.
Tries to finish this f... rebase.