Merge pull request #4951 from jp-bennett/master