Syncronize VisualEditor: 18a9f95..2ab168e

Change-Id: I95d6234e0fcf129700b8f459679972feb12fa834