Merge branch 'stable-3.1'

Marius Burkard

2016-02-19 294a7b557cd280749c94404ce4d75483741d229a

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