Merge pull request #1464 from patrickslin/patch-7