Merge pull request #4981 from stintel/issue4917