Syncronize VisualEditor: f3cd689..b86d481

Change-Id: I702b71223e6f79f96242bbd92b07ded2c5e1a324