Syncronize VisualEditor: 29995d8..d318c5c

Change-Id: I497a8c0dbce9bba77b5145cdc2c427a2a8ea0cae