Merge pull request #5314 from benhsmith/master