Syncronize VisualEditor: 47115a9..1cc342a

Change-Id: Iae70aaeaf0afb374b7cfbd359391d6a599242190