Merge branch 'master' into 'master'

Marius Cramer

2015-07-21 de34a9d7754c9f8b6e8af4334b3950dc886ad064

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