Syncronize VisualEditor: 5f063f4..9f2d31c

Change-Id: I8dfa721a5150b50d7c864d16e69a28f841f02ab4