merge
Merge remote-tracking branch 'origin/master'
added a message about NO_THREADS