Syncronize VisualEditor: 4f7b417..c06dc68

Change-Id: I3d8ed4ff7c91db9394317969df36dcda085223c1