Syncronize VisualEditor: 268c867..402a470

Change-Id: I733ee41f8959b989024655f8d2c5e38f2d66c6d9