Temporary fix for clang and -pthread.
Merge branch 'master' into transforms