Syncronize VisualEditor: 3a96432..68b3b5b

Change-Id: I54d59fb6d7edbf3bb5a81c48b49f70fb53357d18