Merge branch 'master' into 'master'

Marius Cramer

2015-05-05 b2f827b04393eecf33e16d6a883f5e6ff30086d9

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