Commit [9d8474] Maximize Restore History

Merge branch 'dev' into tv/4142

Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>

Tim Van Steenburgh Tim Van Steenburgh 2012-06-22