Merge branch 'consumer-sprint35-bugid-97775' of github.com:Wikia/app into consumer-sprint35-bugid-97775