Merge branch 'master' into 'master'

Marius Cramer

2014-10-11 b98be2e5bcd1abfb98a544fdad66696007925b38

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