Syncronize VisualEditor: 60672bd..25d00cc

Change-Id: I971f944f5c211fb7040932cadac776fb81610e0a