Wikia/app — pull request #2129 by kflorence (2013-11-21 01:53:24+00:00)
Title: Upstream merge 44a459e4..d260eb8

**DO NOT MERGE**
https://wikia-inc.atlassian.net/browse/VE-559

This is an upstream merge from VisualEditor core. Please do not merge until regressions have been fixed.