Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-19 dfe337e04cbc50fed4df23763e67103d6778764e

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