Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-11 de7d2617421127b9cc7edeb3b17401246046714b

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