BAC-949: merge patch for 1.19.8
Merge pull request #1904 from Wikia/BAC-949

BAC-949: merge patch for 1.19.8