Syncronize VisualEditor: 7221579..b2d4d7d

Change-Id: I28dc1842e1969d9c9c248afbbeced9988611b0cb