Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-05 077c4a5ca83ef43f75c1688023c2d9494a407db4

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