Syncronize VisualEditor: b677d97..85abbf7

Change-Id: I0c30a1e25cd423560444ff26592c4dedec53aca2