Merge branch 'EdwinLove-seven-bit-attachment'