Syncronize VisualEditor: c36ff41..d4f1f6c

Change-Id: I4dd3c3537b9157d81ca9db8556629de6eb9b2fab