Update references from 2.x to 4.x
Merge pull request #1595 from sylus/7.x-4.x

Updates for 4.x branch.