Syncronize VisualEditor: c28a48e..aa5c6e9

Change-Id: I118edef30d55680bc2b0f4a3515704c7feaff75d