Merge branch 'master' into 'master'

Marius Cramer

2015-06-27 3ba59d59a2ad4068d78753635531b7625c916258

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