Update upstream (add demurrage calculation).