Merge pull request #3114 from Wikia/ve-sprint-13

VE sprint 13