Merge branch 'stable-3.1'

Marius Burkard

2016-02-29 45e9406a0fd6e872219a09d913bdfa49bd22e87b

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