Merge branch 'stable-3.1'

Marius Burkard

2016-03-02 75124b0197a20947b67b502db19af79d4936f306

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