Merge pull request #4389 from TranceLove/bugfix/4367