Merge branch 'patch-3' into 'stable-3.1'

Till Brehm

2016-07-01 1d87d80fb9eb9a2712e90726a89048f7c03c5995

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