Merge pull request #1123 from teslamint/patch-2