MOB-1834

Code review has taken place in https://github.com/Wikia/app/pull/4081. This pull request is here just to be merged after successful QA.