Merge branch 'master' into 'master'

Marius Burkard

2015-12-31 238326c6e7528571d0e8c68f310591206256ea77

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