Merge branch 'master' into 'master'

Marius Cramer

2015-05-22 8684fba8e8b3557a0ee2eee26a128e13e731c7e6

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