Syncronize VisualEditor: 8fceff4..6a12cac

Change-Id: I63785c6aa5bc1d1e8fac9f2dbbc9dca518d0b0a5