prevent terminal from resuming
Merge branch 'master' into private

* master:
  prevent terminal from resuming