namespace fix
Kernel concepts namespace
fixing conflicts
fixing conflicts
fix
Merge pull request #916 from dcoeurjo/conceptsnamespace

Conceptsnamespace