Syncronize VisualEditor: e9f7882..960922c

Change-Id: I1789dc1120c535be00e64f154f375c3530ddbc1a