Syncronize VisualEditor: c39d1e6..12e4b41

Change-Id: I7c95e606b356212dc26c93b7ed4a044a0ff5fede