Merge branch 'master' into 'master'

Marius Cramer

2015-08-21 98d600f476f4aaf7d4b348ae59e468a96a7801eb

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