Syncronize VisualEditor: cbb113b..b4e98c1

Change-Id: Iad370ca2588b54e9f54e94dbe86eef23d9fbc257