Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-15 d302d8e556da5b1dcd9ce4f9ec086a0e4aa52dd6

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