Syncronize VisualEditor: 4de775b..30c3aa2

Change-Id: Ib57b7bc7e536aafef11fb24d16733e0b6b3ce205