Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-24 f91c070119e135abbab4f3baf62b32059443ba19

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