Merge pull request #3845 from jp-bennett/master