Syncronize VisualEditor: 297e864..ed7cfa1

Change-Id: I5df288eb5cc13b20148fe3c064a56b354adf1098