Syncronize VisualEditor: 2b99b8a..4dc8d28

Change-Id: I11d25e506b941401c3e89dd75c9c812460e9d38a