Merge branch 'stable-3.1'

Marius Burkard

2016-02-21 8a4a057376d8371aa976f3f37b178cd738c4eb59

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