Syncronize VisualEditor: a0989d1..6953938

Change-Id: I3223a31aba05b00f480db54f0ec86074d3c40bd5