Syncronize VisualEditor: af41547..3a378cc

Change-Id: Ia38ddcde5fb3f109592658e6ebe00b73d009cbb1