Merge branch 'html_welcome_mail' into 'stable-3.1'

Marius Burkard

2016-02-06 bc3a7750c366d22ac69561d645312b794b312b84

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