Fix a subtle map bug that erred on nested maps
Merge branch 'master' into precompile