Fix forgotten check of dict type
Merge remote-tracking branch 'upstream/master'
Fixes tests on the worldmap