Syncronize VisualEditor: cc8f697..e0981a3

Change-Id: I390df1c13c799fdf4868cd0ab5ebfb0b865de1ad