Merge pull request #3499 from Wikia/VE-1026

VE-1026