Syncronize VisualEditor: 6432370..3ca0b1f

Change-Id: I96548d40f2f6e49babe58163e01506c53e71eef7