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