Fix C++ Collections
Merge branch 'master' of https://github.com/damsl/K3-Core