Syncronize VisualEditor: afd32fb..3d47542

Change-Id: I31b3f6d4af170aa532ca1108cf0c593de3367979