Syncronize VisualEditor: b267161..2598fe8

Change-Id: I9bca692c07b8e42179609d1bdbd1a27140676f83