Merge branch 'master' into 'master'

Marius Cramer

2015-01-21 c0138f5488dc19898c9e6c2df6c6264ee618e77c

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