am 1d10577e: manual merge from readonly-korg-master

Merge commit '1d10577e9b474a5099d0f5a09468c55a0324d876'

* commit '1d10577e9b474a5099d0f5a09468c55a0324d876':
  Don't alias 'stop' to 'kill -STOP'