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

VE Sprint 13