Wikia/app — pull request #2453 by wsuchy (2014-01-13 15:21:56+00:00)
Title: Pla 1059

Merged PLA-1070 and cherry-picked Artur's changes.