Merge branch 'master' into 'master'

Marius Cramer

2015-08-23 8a77a74e1a7a31196541691fce711bdcebaa1d2e

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