Merge branch 'master' into 'master'

Marius Cramer

2015-11-12 8ce5e3054e6bc70cc44e8d2d002ac035f02bd9ec

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