Syncronize VisualEditor: a6b149d..ae2f513

Change-Id: I301f7ca526dd32880b1541358f30c886b4fdff4a