Merge remote-tracking branch 'origin/roland/nptl-alpha'