Fix event navigation in events with same timestamp

Closes #1071 

(Attempting pull request #1225 again, rebased against current master, because I *think* it failed in Travis only because of an unrelated test fixture problem a month ago.)