Syncronize VisualEditor: 1606452..6c1c01c

Change-Id: I7c43f09a317ecd0fc0182fd375b9fd86463bec9f