Syncronize VisualEditor: f9aecc4..0d4aaf5

Change-Id: I8dfa28e73c4854fe8f1bd94b01f3b79bb86e0ce8