Syncronize VisualEditor: 6f54034..c964660

Change-Id: Ibc3d99499ed1763651a60154d492e4ba9f7dde30