Merge pull request #1340 from teslamint/patch-1