Syncronize VisualEditor: aae2fb0..da5d884

Change-Id: I5ea12fb24c3abd905a2168fa9dd515eb55a2f7cc