Merge branch 'patch-1' into 'stable-3.1'

Till Brehm

2016-04-27 65dc1a19e784f20f4b275c0fdc519d27a4a9b08e

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