Merge branch 'stable-3.1'

Marius Burkard

2016-03-23 f964bf7e7403578e787ce5519d9e63c074967242

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