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