Merge branch 'stable-3.1' into 'stable-3.1'

Till Brehm

2016-05-19 9d3f20bb3ef7391c94eae54ddf3750bcc181678e

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