add compatibility with clang
Merge commit '4c306ae'