commit on the trunk
Merge branch 'master' into testbranch

Conflicts:
	README.md