Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-10-13 43418672d32ee65ee6060314d4e66c3c44a8b0cb

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