- WS
Merge remote-tracking branch 'upstream/master'
- Use CLEVER_THREADS to detect pthreads usage