Merge pull request #1964 from alanbuxey/v3.0.x