Merge branch 'master' into 'master'

Marius Cramer

2015-10-22 796661c563939605d8c7ba7e01b7ecf62f9cd1cf

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