Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-10-14 466f06a5845e57661092392055999cc0895af5f8

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