Merge branch 'master' into 'master'

Marius Burkard

2015-12-13 d240f6d285ea4696b087763d99089591cb02fcfd

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