Adding support for Clang 3.1 + STL