Merge remote-tracking branch 'thestinger/old_map' into deriving

Conflicts:
	src/test/bench/core-map.rs