Merge branch 'master' into 'master'

Marius Cramer

2015-01-14 66190e1134676f3addf703b0424761c21cad7c52

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