Merge branch 'master' into examples-out

Conflicts:
	crant
use directory tests/Examples instead of Examples
Merge branch 'examples-out' into develop

Conflicts:
	crant