fix a bug causing too many timer events to be generated, affecting performance
fix an omission in testing conditions on receipt of an event
Merge branch 'master' of github.com:latproc/latproc