Merge branch 'master' into 'master'

Marius Cramer

2015-02-16 14f5a343328f7db49008255211af7cf08342a83c

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