Vid 1440

from https://github.com/Wikia/app/pull/2984