VE-1338: Pull in change from upstream
Merge pull request #4378 from Wikia/VE-1338

VE-1338: Pull in change from upstream