Wikia/app — pull request #5850 by lizlux (2014-12-22 23:26:32+00:00)
Title: 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