Merge branch 'master' into 'master'

Marius Cramer

2014-08-18 a9e6315be66a5cf3a743a1e1a7c8da4eb980e97c

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