bugfix: std::map does not support local classes
Merge branch 'master' into next
Merge branch 'master' into next