Syncronize VisualEditor: ed22cbf..54b938e

Change-Id: I0d54c871a60fd0ddfc22cb8d6c01ebe7d26bd039