Merge branch 'stable-3.1'

Marius Burkard

2016-01-20 337473b29af23892d2bcbe4cc97c087aa5ff8b30

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