Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-26 b3e7785b3ab5ea70675e0d944b3a746464c4143f

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