Merge pull request #1896 from mcnewton/v3.0.x