Syncronize VisualEditor: 216e308..8e9a35f

Change-Id: I9b2eff2235ab6d0cc07f20cb9141e312a79f5caf