Syncronize VisualEditor: f4bc61d..5c68803

Change-Id: I227b82c5a968aba48df8df72d9943ee892a202e1