merge from subsumption library
fix to build with clang