Syncronize VisualEditor: 396d740..aab1680

Change-Id: I0a6f99ac8e5a9626b2e33bda253cd2cbe7a9dd9e