Merge pull request #843 from bradymiller/fix-blink