Fixed overly broad event clustering. Re: #854
Re-fix overly broad cluster, events need to be sorted correctly
Get rid of the reverse
Merge remote branch 'upstream/master'