Merge branch 'stable-3.1'

Marius Burkard

2016-01-26 ab3c7dfb89aee966d336c2d68d0220d5a1b7893e

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