Merge branch 'master' into DutchTestBranchToGetChanges

Conflicts:
	README.md
Merge branch 'master' into DutchTestBranchToGetChanges

Conflicts:
	README.md