Merge pull request #66 from davecramer/REL9_2_STABLE

fixed compile mistake
backpatched canceltimer bug reported by Andri-Redko