Merge branch 'stable-3.1'

Marius Burkard

2016-02-04 eca13b968042fe7c21a5a01daaf1e1dffd3a83c6

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