trellis: fix typos in examples
Merge branch 'maint'
Merge branch 'master' into next