Merge branch 'master' into 'master'

Till Brehm

2015-11-10 d925b32c307121dd89a4424889c92a8c7f986811

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