Merge remote-tracking branch 'origin/kernel-update' into glibc-update2