Syncronize VisualEditor: f116584..2d834ec

Change-Id: I1d11da4990959eaef95eeeb345efc4b0fa68d68a