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