Syncronize VisualEditor: 20d6df9..5aafc12

Change-Id: Ic9934a511cd014788f8c50c729f1b3245adda989