Merge gryn's transfer digit timeout patch (bug #2184)