Merged hg changes, new benchmark scripts