Syncronize VisualEditor: 813cbd0..a6b149d

Change-Id: I3c1e465d2959ebe726d92095181357210015867d