Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard

2016-05-06 0ebe6194791bdf59f85b1037a6a43327ac199fe4

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