Syncronize VisualEditor: 5e4ab8b..2b3e19b

Change-Id: I1ad81faa5a6df34ef485c91ce16cf1f61b01405d