Merge branch 'stable-3.1'

Marius Burkard

2016-01-20 337473b29af23892d2bcbe4cc97c087aa5ff8b30

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