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.