Syncronize VisualEditor: 0d4aaf5..afa3264

Change-Id: I94176a14d7c1e7d0b5e9a5ba67c2a742ac2b5617