Merge pull request #3461 from tinybug/patch-2