Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-19 dfe337e04cbc50fed4df23763e67103d6778764e

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