Syncronize VisualEditor: f295d21..cc45c6a

Change-Id: I55326ac1756f73a70438a77830546325d9a63b1a