Pull in kwatson's fix for backgrounding