Merge branch 'master' into 'master'

Marius Cramer

2015-09-24 9f557ddc325b64fd8e01d987cdc28e505d9434d5

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