Merge branch 'master' into 'master'

Marius Cramer

2015-04-27 13a336cf2c48089c3235a878e299c5244cc48aa9

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