Fixes saltstack/salt/#3273
Merge pull request #3296 from torhve/loopinterval

Fixes saltstack/salt/#3273
Merge branch 'develop' of github.com:saltstack/salt into develop