Syncronize VisualEditor: 2ebbd0f..7b47c51

Change-Id: I19e5c158e08e93e74e0d6060a584704f4b8e5cfa