Merge branch 'master' into 'master'

Marius Burkard

2015-12-23 6a00b4e599f724cbc9a12927c8a0446ef5621028

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