Merge branch 'master' into 'master'

Marius Cramer

2015-03-09 e564b4796a4256a67328e117c9675ccae7d872cd

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