Merge branch 'master' into 'master'

Marius Burkard

2015-12-13 d240f6d285ea4696b087763d99089591cb02fcfd

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