Syncronize VisualEditor: 1f136f9..a26aeca

Change-Id: I71f966dbddb33ec9522901203c1e04bde7febc1a