Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-26 b3e7785b3ab5ea70675e0d944b3a746464c4143f

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