Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-26 6028e4692d172b63f8af79c4460f9dbff5a9a01c

 install/sql/incremental/upd_0038.sql

@@ -1,4 +1,4 @@
-- --------------------------------------------------------
-- --------------------------------------------------------

ALTER TABLE `web_domain` ADD `web_folder` VARCHAR( 100 ) DEFAULT NULL AFTER `document_root` ;