UC-45

Merging @garthwebb's changes from https://github.com/Wikia/app/pull/5788/files into uconn-3 after conflicts fixed.  

https://wikia-inc.atlassian.net/browse/UC-45

Probably best viewed with https://github.com/Wikia/app/pull/5850/files?w=1