Merge branch 'fix-ftp-pwreset-issue' into 'stable-3.1'

Till Brehm

2016-06-14 9aa347811e4825781ff5cafbcb78b70ff5e25c6d

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