Syncronize VisualEditor: aeec009..afb182c

Change-Id: Id02c56bd7285de2caf20568be9cfdfbb8eb62ed9