Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-26 9f65de0b6bbfb0824e34088029e4f593a28303e1

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