Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-13 c420e715c5bf53527b5828b0de3fa3b52bdff4d1

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