Syncronize VisualEditor: 261fcbb..219ca37

Change-Id: I205de9afb38a2e05cd29819649a739042c906b31