Merge branch 'html_welcome_mail' into 'stable-3.1'

Marius Burkard

2016-02-06 bc3a7750c366d22ac69561d645312b794b312b84

1
ALTER TABLE  `sys_session` CHANGE  `session_id`  `session_id` VARCHAR( 64 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL;