Merge branch 'fix-3986' into 'stable-3.1'

Till Brehm

2016-07-21 d682d6652ac253e601b76f7a8f3cd38ba31ea73e

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