Merge branch 'stable-3.1'

Marius Burkard

2016-05-26 8c6a4706f8bf375738197ed83d1f91d8a17032ef

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