Merge branch 'stable-3.1'

Marius Burkard

2016-02-12 b0f818efec0b74741d6fa53d0e86a95065d4e2d1

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