Merge branch 'stable-3.0.5'

Marius Cramer

2015-11-17 a5714c39c76695af5b2220e93a4ac3121a9d83a1

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