Syncronize VisualEditor: c266766..7317114

Change-Id: I78bde60483ba78866d94c2949d2f48f261f4f1d3