Merge pull request #3006 from Wikia/VID-1436

VID-1436