master and v4 branches have diverged

The v4 branch and master branches should be identical since master represents the "latest" release. Not only are they not identical but master has 3.1.2 which is not present in v4. Fix up the v4 and master branches to be aligned.