am 6be163b1: merge from open-source master

Merge commit '6be163b167e986b4fafda9290e5d74fc3945b273' into kraken

* commit '6be163b167e986b4fafda9290e5d74fc3945b273':
  Emit shell prompt even when in non-interactive mode.