Syncronize VisualEditor: b70f217..396d740

Change-Id: Ia6d4de2c7ee1bbf6a97a305d2d1a49e47e9af93d