Syncronize VisualEditor: cfee804..cc8f697

Change-Id: I9aad8394e9357e241808db19b86994c131b59e56