Merge branch 'stable-3.1'

Marius Burkard

2016-06-07 b63119417fe6e4bbcd072108d7dec927ee879d4a

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