Merge remote-tracking branch 'github/master'

Conflicts:
	lib/InstanceManagement/Manager.php