Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-04 f6513f0be58f1dd441f3778f8a9d259bbc7267e4

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