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

* commit '7c386a610d9164c12932452d1ff671e070956ec1':
  Extend and document the "wait" command