Merge pull request #2010 from Wikia/ve-sprint-6

VE sprint 6