Syncronize VisualEditor: e869ecd..3b3a667

Change-Id: I0891f1a00a6c73867e6c778c8c92c925596cecd6