Merge branch 'nowait'
authorTim Vaughan <tgvaughan@gmail.com>
Thu, 31 Oct 2019 18:41:43 +0000 (19:41 +0100)
committerTim Vaughan <tgvaughan@gmail.com>
Thu, 31 Oct 2019 18:41:43 +0000 (19:41 +0100)

Trivial merge