Merge pull request #4831 from pgavlin/gh2300