Fix map instantiation syntax
Merge branch 'master' into kevin-partition