Syncronize VisualEditor: 2fb6b56..486e9cb

Change-Id: I1d78e5b7cc2723d620d3e77299adbc3d646aabbd