Syncronize VisualEditor: 06aa537..4807d4c

Change-Id: I568c6db5e0a8d7f0d2577d2d52a62d1e04c4a9f2