small debug fix
Add iterators to shated_map
Merge remote-tracking branch 'upstream/master' into next