Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-13 3cf77b791fb646e5837dac63a2e8c06604771b1d

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