Fixed monthly cycling again.
Handle quick shutdown with polling better.
Merge pull request #753 from hjoliver/fix-monthy-cycling-again

Fixed monthly cycling - again!
Merge pull request #757 from hjoliver/749-polling-quick-stop

Handle quick shutdown with polling better.