Syncronize VisualEditor: 2b84bbb..aa6983f

Change-Id: I55844f4f1a8aea2c5362bec81710084bfc48deae