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