Syncronize VisualEditor: 654d641..e21b4db

Change-Id: I5fe9ac0a219aad6846155aab604c0f39f09c643e