Merge branch 'master' into 'master'

Marius Cramer

2015-02-18 a0731012e7a4c0c09cdf69b8d2a913e62f9b2a59

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