Merge branch 'spamfilter-delete-fix' into 'stable-3.1'

Till Brehm

2016-07-11 a62af307fd9bf33b34df292120cb73e37d8223da

1
ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;