fix for null timer on shutdown
Merge remote-tracking branch 'origin/master'