fixed a makefile thing for older versions of clang
Merging release into master.