CON-142

Re-opening a pull request for changes that were reviewed and tested ( https://github.com/Wikia/app/pull/1014 )