Merge branch 'master' into 'master'

Marius Burkard

2016-01-10 c2dd9c58d6d3590c519e42bb2ec8e6a56e071118

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