Syncronize VisualEditor: 315f10c..3edad8d

Change-Id: I3c66efa483369a017fe08c8f0d163ae49383b895