Fixes DEVELOPER-829

Also update to blinkr
Merge pull request #441 from LightGuard/DEVELOPER-829

Fixes DEVELOPER-829