Syncronize VisualEditor: 31d2ceb..3b91c34

Change-Id: I12abe12abfec62d0bd9fc785072d4dc57d89b5a1