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

merging changes to dev after prod push