Syncronize VisualEditor: e4e9405..6c9a997

Change-Id: I071f260a1d58211e9ddc6b6688e874e79fe12224