fix from 1.0.14bugfix
Merge branch 'master' into develop

* master:
  fix from 1.0.14bugfix

Conflicts:
	manager/includes/version.inc.php