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