Syncronize VisualEditor: aa6983f..cf56fbd

Change-Id: I1fe9543fca1e70df9fb772225f019553413fbaea