Merge branch 'master' into 'master'

Marius Cramer

2015-09-17 b3ada5210398434515ef9fa6acfd223b501ca495

1
ALTER TABLE `web_domain` ADD `backup_excludes` MEDIUMTEXT NULL AFTER `backup_copies` ;