d588620e70bf15da29cc242e4ae8d86977e8f36a from master; fix hang if you cancel a paused...