Syncronize VisualEditor: c1200d7..329b4de

Change-Id: Ib86aa356f2f135c9c9accad9093b296cec418941