Commit [ec3f4f] Maximize Restore History

Merge remote-tracking branch 'origin/fixConformance' into fixConformance

amw amw 2012-02-21