Multiple timer insert/delete - mySQL simplification + test clean up
Merge remote-tracking branch 'origin/timer-insert-delete' into timer-insert-delete