Syncronize VisualEditor: 954fec8..98d2a9c

Change-Id: I228434a04d6fbee548994c81cc2f105d4b0d9cf2