am c3a4a054: am 3af04b71: am 7c386a61: Merge "Extend and document the "wait" command"

* commit 'c3a4a054a99b62cb4fd593d95f3b2b0017202b20':
  Extend and document the "wait" command