Merge branch 'xfs-quota' into 'stable-3.1'

Till Brehm

2016-04-24 bc6917486cdf177db87d9d6d1a2fad57bed17ce3

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