Syncronize VisualEditor: 7228f6b..4f7b417

Change-Id: Ie062b047ac31faaf30c7b5c7c6cc4d19ce950681