Syncronize VisualEditor: 318f603..0357df0

Change-Id: I8abd3d636e2c5c688c042d1b27c8dea2c537e61f