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

Marius Burkard

2016-06-03 bd4c2e96fd4566bfcd8042f82ccac090419734a3

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