Merge branch 'master' into 'master'

Marius Burkard

2015-11-30 e6ded3ab52b8b823660181db85be511b2ef1ffe5

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