Syncronize VisualEditor: f951799..309305b

Change-Id: I45abf2609cde28e61aabd4c19ba99ddcf09a737d