Merge branch 'fix-issue-3943' into 'stable-3.1'

Till Brehm

2016-06-14 da8c5263302809434d43c9f385f8bac57b49d851

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