Syncronize VisualEditor: aa3c520..957a2cb

Change-Id: Ie7d063c0e0e7608d226c1ca7bbaf17f7b1eefad6