Syncronize VisualEditor: 68b3b5b..7964c58

Change-Id: I75677d38e45e39b329afbad45598409bb37049b0