Merge branch 'master' into 'master'

Marius Burkard

2015-12-23 4100550ca57282b76338ed3d16993189d7302037

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