Merge remote-tracking branch 'strace/master' into HEAD