Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-05-26 498c86fbbfc4aa034758693309dd97b7ca4ef4f0

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