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

Marius Burkard

2016-05-03 f43994cca340165770db223e116fd81e9ab7b429

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