Merge branch 'stable-3.1'

Marius Burkard

2016-01-20 ec64cf5c39c388c297607ba3ac1424f057eafaee

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