Merge branch 'ah/unpack-trees-advice-messages' into maint

Grammofix. * ah/unpack-trees-advice-messages: unpack-trees: fix English grammar in do-this-before-that messages