missing edits from master?

Missing some obvious edits from the current master.  Must have forked an
older version..?