Merge branch 'patch-1' into 'master'

Marius Burkard

2016-03-30 e004715f9a4eea0eeb7eb5c620ff3e973696d5e7

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