Syncronize VisualEditor: 5ff9730..7be6994

Change-Id: I6c903ecdc6f39ba6a166bd9d211525b2d66c29cd