Syncronize VisualEditor: ede14c7..1b69fc9

Change-Id: I448cfddcdabce89f36a0383981cb91b1a5cfb341