Syncronize VisualEditor: 9f3f95d..6a20e1b

Change-Id: I23573863a904b96754400a5fa3bec8a55979f79b