Merge branch 'master' into 'master'

Marius Cramer

2015-11-14 b717d292577f33f2e2ca044da469d8663aa982f6

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