Merge pull request #1792 from redstar/overrun