Merge pull request #4261 from tinybug/patch-4