Syncronize VisualEditor: 6ca0046..b4bf8a1

Change-Id: Ibda879bb6bca4c492f986e6ae9dd3720ef45eb40