Merge pull request #1606 from teslamint/patch-2