Syncronize VisualEditor: bf1574f..cbc2fcb

Change-Id: Ibdbd4f59aaee105f105304e06c2c2a90f26a023d