Syncronize VisualEditor: d0c794b..9d25c28

Change-Id: I761797f1e36d5fca51690521efa1fe3894bf7c82