Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-04 f6513f0be58f1dd441f3778f8a9d259bbc7267e4

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