Commit c606266a authored by Graham, Aaron's avatar Graham, Aaron
Browse files

Merge branch 'hotfix_timers' into 'master' 

Try to prevent Timer error once and for all

See merge request futility/Futility!362
parents 9b2b6136 2527159d