Merge pull request #1214 from DavidJRobertson/configurable-kill-poll-rate