Syncronize VisualEditor: e1b8dd7..2c60bbe

Change-Id: Ifefdfc1cd37a9beb9be8ef8ed3372f26aba63785