Included changes from stable that could not be merged

Marius Cramer

2014-01-28 746e52a6f3cfdd6438f9c62b39c119925a9405f9

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