Merge branch 'patch-1' into 'stable-3.1'

Marius Burkard

2016-05-03 f43994cca340165770db223e116fd81e9ab7b429

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