Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-22 17d53616b36fef3b753fc408bfc600f360673333

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