Merge remote-tracking branch 'renky/master_fixes'

Marius Cramer

2014-04-10 7e886ae640ca6b38b332f139427d69ae50cca352

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