Merge branch 'master' into 'master'

Marius Cramer

2015-08-16 3e783660d8cb49f6c5067baf4c7c3bbcd4975846

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