Syncronize VisualEditor: b360786..7a60841

Change-Id: I27e216de86ed58a2378a6b85e843bd4c2dbbe3af