Merge branch 'stable-3.1'

Marius Burkard

2016-01-20 ec64cf5c39c388c297607ba3ac1424f057eafaee

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