Merge branch 'master' into 'master'

Marius Cramer

2015-09-03 e10d34abca22c0d18759c536dd5ba1bca9705734

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