Merge branch 't-prove-target' into pu

* branch t-prove-target:
  t/Makefile: add a "prove" target
Merge branch 'dedent-commentary' into pu

* branch dedent-commentary:
  Dedent comments when adding them to merge messages