Merge branch 'master' into 'master'

Marius Cramer

2015-09-12 6cdb029df901248cf6f9bbd74586cc6f62051fee

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