Syncronize VisualEditor: 4fbd141..a479d04

Change-Id: Ic4316fc15307a7a68542dd50dd3625de7ce2ac43