Syncronize VisualEditor: 3718550..8bc150f

Change-Id: I1f47bccc02236c58c05b6867cdc3980b2485dfd9