Merge branch 'boost.thread'