update to 1.0.14-d6.9
Merge branch 'master' into develop

* master:
  update to 1.0.14-d6.9

Conflicts:
	manager/includes/version.inc.php