very minor changes to Tim's master stroke
Cover letter
Merge branch 'stouffer-master'