Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-14 80c6a7f559ceb100b82921019bab3a0c5ed2ae2a

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