Merge branch 'master' into 'master'

Marius Cramer

2015-03-31 e146fe8cebdf9201ccd67b37333a6c423ac5c1f4

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