Pull in suspend bug fix from @jimmypoms.