Merge branch 'master' into 'master'

Marius Cramer

2015-06-29 7bcf62fc4e4b119c68998e2570005695eb5778f8

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