CON-679
Merge pull request #2942 from Wikia/CON-679

CON-679