Merge branch 'master' into 'master'

Marius Cramer

2015-08-23 eb1177f61b0299bb011ffc1180e0d3c7fc1e87fc

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