Merge remote-tracking branch 'origin/master' into reduce_userland_deps