Merge remote into master
Bumped txn-outgress to version 24