Toby Samples' extensions to take attachment as a Stream or Bytes
Merge remote-tracking branch 'origin/paul' into nathan