Merge branch 'focus/cpp' of github.com:DaMSL/K3-Core into focus/cpp