makefile threadsafety
Merging release into master.