Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-25 b01718a0ae2b53c18c01f1374799a00a0c11279f

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