Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-30 5e981c0c36166071298a6b82cead9f81310842ab

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