Syncronize VisualEditor: d219886..36f95e4

Change-Id: I95bc8e01065db24dca0ad3539d68fb039fbe7a76