Merge branch 'refactor-genvers' into pu

* refactor-genvers:
  genvers: Learn to use git describe --dirty
Merge branch 'fix-loadtest' into pu

* fix-loadtest:
  t: Fix using diag in load.t