Merge pull request #1517 from sylus/7.x-2.x

Merging 7.x-1.x improvements into 7.x-2.x branch.
Merge pull request #1519 from sylus/7.x-2.x

Updates for 2.x branch.
Merge pull request #1521 from sylus/7.x-2.x

Updates for 2.x branch.
Update WetKit Search for Correct invalid patch specification.