Syncronize VisualEditor: 5999490..6b800c3

Change-Id: I6353033dc2dcb81435115bd9d031c5f70a8e5080