Syncronize VisualEditor: 7efd0b6..6d87cd6

Change-Id: I78f3ec9d5ea6065daafdf24091ffa77a8afb8b31
Merge "Syncronize VisualEditor: 7efd0b6..6d87cd6"