Syncronize VisualEditor: aee1b12..97813e2

Change-Id: I80702972c62dca8dde060100f9a5fd7e5519dec3