Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-06-16 e674659333619b155abf9e946a56e48d42861c22

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