Merge branch 'eb/no-pthreads'