Wikia/app — pull request #3157 by lizlux (2014-03-17 23:35:46+00:00)
Title: Vid 1488 cherry pick

already pushed to prod, gotta push it to preview