Commit [d13b9c] Maximize Restore History

Merge branch 'dev' into tv/4142

Tim Van Steenburgh Tim Van Steenburgh 2012-06-26