Merge branch 'stable-3.1'

Marius Burkard

2016-01-26 c02e3dc6a5b0b65a95a75ca1e37294aee615d108

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