Merge pull request #1269 from teslamint/patch-2