Merge branch 'stable-3.1'

Marius Burkard

2016-01-31 3117f2e70389b0a3e03a683ec8b03e4e0a7eea87

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