Merge branch 'stable-3.1'

Marius Burkard

2016-02-19 294a7b557cd280749c94404ce4d75483741d229a

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