Merge pull request #1277 from vhpoet/release

[FIX] Exchange: Demurrage fix