Merge pull request #2210 from alandotcom/patch-1