Syncronize VisualEditor: 06afe09..5dff7fc

Change-Id: I395c42e47b4e35bcf0f2bf8bea09fa3ea5053500