Using wrapped collection types for Map<Str,Obj> and Set<Ident>
Merge branch 'master' into martyn82