Syncronize VisualEditor: 8960cc2..4ec4053

Change-Id: I372deb1bdfb7f728abe5fba72ce898d7396c8423