CON-82

Reopening a pull request to dev for changes that were reviewed and tested as part of ( https://github.com/Wikia/app/pull/1008 )