Merge remote-tracking branch 'tests/master' into dev

Conflicts:
	.gitignore
	README.md