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

* commit '3af04b71e51e89af02a1fe526e4fc32dce0100d3':
  Extend and document the "wait" command