Merge tag 'v3.10.13' into lsk/v3.10/topic/kvm