Commit [3522e8] Maximize Restore History

Merge branch 'wip/color-parsing-improvements'

Colomban Wendling Colomban Wendling 2013-12-03