Merge branch 'master' into new-branch-example

Conflicts:
	README.md