Merge branch 'stable-3.1'

Marius Burkard

2016-02-12 0a1e91436807e8d368d91695e643fdb74747720e

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