Merge branch 'stable-3.1'

Marius Burkard

2016-02-04 0c6ca563001ffeaf12081a26f226bf0cab543b65

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