Syncronize VisualEditor: c9c10cf..9ebd388

Change-Id: I47ca13fe22e5f3a92e72bfb7508dcd4936cde637