Syncronize VisualEditor: eaa4a2a..97b9c11

Change-Id: I3be3ceddde89718923d61f75a83599fa3c7431e7