Merge remote-tracking branch 'origin/master' into prgn-bitfield-signing-fixes

Note: sorted the imports in messages.rs because it was getting difficult
to determine what the true diffs were by eye.