Merge branch 'mergebranch' into 'master'

Marius Burkard

2016-01-04 a4e127a6af97041b2c067f888f8c73a8aec682f1

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