Merge branch 'master' into 'master'

Marius Cramer

2015-06-02 6f2d95f4f36043e38b14599f5878af320566f8f4

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