Merge pull request #4952 from jp-bennett/master