Merge branch 'master' into 'master'

Marius Burkard

2015-12-08 10e9f75e0948d9dd72a4431c67292a05d582483c

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