Merge branch 'master' into 'master'

Marius Burkard

2015-11-30 e6ded3ab52b8b823660181db85be511b2ef1ffe5

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