Syncronize VisualEditor: 12e4b41..0b5d86b

Change-Id: I4a38aa9b109c56f328127d58cf4a46631a29d682