Merge branch 'stable-3.1'

Marius Burkard

2016-06-07 b63119417fe6e4bbcd072108d7dec927ee879d4a

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