Syncronize VisualEditor: c402528..9a1ed3c

Change-Id: I2fd7049bc0b92af665b7b26634e34f2af0acca1d