trunk chase notes
first pass patch fixing
update patchlist wording
import upstream patch