Syncronize VisualEditor: d9ae444..e9ad209

Change-Id: Iec4e971ce8493858bed95109f19d32960353d627