Merge pull request #4121 from Black09/fixes