Merge branch 'develop' of https://github.com/mvgorp/emaho into develop

Conflicts:
	feature1.php