Merge branch 'stable-3.1'

Marius Burkard

2016-02-04 22efd48fd42104a2526eef58cad543d4abbb83b5

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