Merge branch 'stable-3.1'

Marius Burkard

2016-02-24 5e82da8cacb670f329102b8d15b982ac1960e62f

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';