Syncronize VisualEditor: ed324ea..a2309da

Change-Id: Ib85babb44371be60cf02ce501620ed72ae125eac