Wikia/app — pull request #4123 by lizlux (2014-07-11 14:09:36+00:00)
Title: Vid 1821 release

PR to merge VID-1821 into release branch (cherry-picked after conflicts)