Syncronize VisualEditor: 6c6937a..c25a48c

Change-Id: I9e171ef80c7849cedf31dd2a3d8a4a4f9badc745