Merge branch 'master' into 'master'

Marius Cramer

2015-09-18 5cc181a90f7d27f4ec578a8a892b4dd0ca44adf4

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