Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-30 22c91099a17a134ed90cd94223baf9c92ba106f4

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