Merge branch 'master_fixes' into 'master'

Dominik

2014-02-26 5a2985f97fb4ef24085722957b3a5e53bfa38949

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