Merge branch 'master' into 'master'

Marius Cramer

2015-07-09 e2963947c8428a8bae4a013e8c88dc4bdf299075

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