Merge "Add some level of compatibility with STL"