Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-25 7198764e180cf0af9f619a9079beeb12c286cf4a

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