Syncronize VisualEditor: cb0f964..a81313f

Change-Id: I9c1b46584f0427333887b6b07792709ebc2ec67c