Syncronize VisualEditor: b33ab8d..1509e31

Change-Id: I769fb02ca48b85d783ed8e68b5622295519e19a0