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