Syncronize VisualEditor: d0ad807..f4bc61d

Change-Id: I9f34f15453d931f46b5af5febe4a8670a589e74e