Merge branch 'master' into 'master'

Marius Cramer

2015-08-17 363cb9591d68e99169ff6d6a29f2e29daf16cd13

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