Wikia/app — pull request #4930 by lizlux (2014-10-01 22:09:00+00:00)
Title: Vid 2009 cherry pick

merging branch into dev