Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-26 2e86dd528354a8267521e045a185f920683e4724

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