Syncronize VisualEditor: a517839..fcfb847

Change-Id: I4f15c2b085685228a8593e4c0f90e29a3ee4d17c