Merge branch 'pthreads'