Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 7a3fd811b791ab5cf7787541832462f4e4bc35f4

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