Syncronize VisualEditor: 87ad037..94c30f0

Change-Id: Ie9978e6ebf46f63232f76961021c9502c385c90a