Fixed a merge error picking up a theading fix for timers.  #4
Fixed a merge error picking up a theading fix for timers.  #4

lwriemen/mc,leviathan747/mc,john-tornblom/mc,xtuml/mc,rmulvey/mc,xtuml/mc,lwriemen/mc,leviathan747/mc,leviathan747/mc,xtuml/mc,keithbrown/mc,keithbrown/mc,cortlandstarrett/mc,cortlandstarrett/mc,cortlandstarrett/mc,keithbrown/mc,john-tornblom/mc,lwriemen/mc,cortlandstarrett/mc,john-tornblom/mc,john-tornblom/mc,lwriemen/mc,xtuml/mc,leviathan747/mc,lwriemen/mc,leviathan747/mc,lwriemen/mc,cortlandstarrett/mc,rmulvey/mc,keithbrown/mc,john-tornblom/mc,john-tornblom/mc,keithbrown/mc,rmulvey/mc,leviathan747/mc,cortlandstarrett/mc,xtuml/mc,rmulvey/mc,rmulvey/mc,rmulvey/mc,john-tornblom/mc,xtuml/mc,keithbrown/mc,john-tornblom/mc