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