Merge branch 'master' into 'master'

Marius Cramer

2015-07-07 c755f8131c38a3f0c5f97cf029959789aae133f3

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