Какой-то фикс.
Merge remote-tracking branch 'origin/master'

Conflicts:
	root/servers.php