Merge branch 'patch-1' into 'master'

Marius Burkard

2016-03-30 e004715f9a4eea0eeb7eb5c620ff3e973696d5e7

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