Syncronize VisualEditor: 0496bd8..610f41e

Change-Id: Ic50a8c17b1c89823370a7d548c0eea697ef51188