Fix for single scheduled events not firing
Merge branch 'git183'