Merge pull request #788 from teslamint/patch-1