Syncronize VisualEditor: 12bff6a..3ed8072

Change-Id: I05b08d827cb0e2647cc73b8f11ef21acbe600780