Syncronize VisualEditor: 30c3aa2..c34fd60

Change-Id: Id834e90a9ca97fdb1159cf3bb641f3af7bb904c4