Syncronize VisualEditor: 48fd057..268c867

Change-Id: I70f1af241564e5e506e0fc0dbc7322a2f3a1657c