Merge pull request #1583 from sylus/7.x-1.x

Updates for 1.x branch.
Merge pull request #1584 from sylus/7.x-1.x

Updates for 1.x branch.
Update WetKit Widgets for Fix for media + file entity schema issue.