Merge branch 'stable-3.1'

Marius Burkard

2016-02-17 aef2832197d4627cf87fdd5ebf69b25c68a411a7

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