Merge branch 'stable-3.1'

Marius Burkard

2016-03-02 fb41e2139d572d66b9ee2578d23fe0724534da6b

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