Merge branch 'master' into 'master'

Marius Cramer

2015-01-08 513a1785121fe98ced58bb0713885926a1ee42a9

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