Syncronize VisualEditor: 047d6bf..8e4fe35

Change-Id: Ib7f5f19f2fd8d0c6ed5066b741cfae966d74c25b