Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-18 324bfbde30d632bcd19009dbca1cb68cb160fbc1

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