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