Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-29 dad105ff4110e29a584af3e5dc75c0f3cfcd0dce

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