Syncronize VisualEditor: 2d3bf97..50e59f3

Change-Id: Ifb283595dff279f49e6dceb21b00db4ad960b3ea