Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-26 6c189dba224d1e1de138e763d8146fea21bc6a2f

1
ALTER TABLE `web_domain` ADD `document_root_www` VARCHAR( 255 ) NULL AFTER `document_root`;