Merge pull request #5193 from luhenry/2017-04-fix-56155