Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-17 21ef2a6c470b42655fee4baf5f3f4251ea2dd9ec

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