Merge branch 'master' into 'master'

Marius Cramer

2015-09-17 b3ada5210398434515ef9fa6acfd223b501ca495

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