Update to upstream master and include improved animation driver.