Merge branch 'mail-fix-style' into 'stable-3.1'

Till Brehm

2016-04-13 9301bdae65a51798040a163cff53c46dd1c9f33c

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