Final prep for beta release.
Merge pull request #1597 from sylus/7.x-4.x

Updates for 4.x branch.