Merge branch 'fix-4030' into 'stable-3.1'

Till Brehm

2016-07-21 4f8673d1eef39fde0e5d1a3ca6580f396f14ff63

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