Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-17 21ef2a6c470b42655fee4baf5f3f4251ea2dd9ec

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