Merge branch 'mail_filter_fix' into 'master'

Till Brehm

2016-03-22 069b2fea73b3613776af8ced5f20fc1bac269121

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