Merge branch 'master' into 'master'

Marius Cramer

2015-09-13 1ec1fc69c4b550b15f3b04d2988e2138a5e22477

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