Merge branch 'stable-3.1'

Marius Burkard

2016-02-19 51c155ab6f8c0eb1ea4ad75aaba6f6e1cecc3885

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