Fix STL container dictionaries not being created
Merge branch 'master' into develop