Syncronize VisualEditor: 960922c..d41a1d5

Change-Id: Ib2f1c405e303a88f6e24bd054a7f274ba1a1189f