Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-29 dad105ff4110e29a584af3e5dc75c0f3cfcd0dce

1
2
3
-- --------------------------------------------------------
 
ALTER TABLE `web_domain` ADD `web_folder` VARCHAR( 100 ) DEFAULT NULL AFTER `document_root` ;