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