Move from 2.x to 4.x for WxT version sync.
Update to first beta for 4.x branch.
Merge pull request #1594 from sylus/7.x-4.x

Updates for 4.x branch.