Merge pull request #1239 from patrickslin/patch-3