Merge branch 'stable-3.1'

Marius Burkard

2016-02-04 b973ff1298fed20030a13d86e1233151a7e3189b

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