Syncronize VisualEditor: 1c84584..c5c2cb8

Change-Id: I099fd3abe8ca2fbc635f0a95eab1fe97f87a414f