Merge branch 'stable-3.1'

Marius Burkard

2016-03-23 f964bf7e7403578e787ce5519d9e63c074967242

1
ALTER TABLE `client` CHANGE `web_php_options` `web_php_options` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp,php-fpm';