Merge branch 'master' into boost.thread