Use stl_algobase.h for ICC and Clang compilers using libstdc++
Merge branch 'develop'