Merge commit 'd6d83279183db749de07bfdac79fe4180fc848d0' * commit 'd6d83279183db749de07bfdac79fe4180fc848d0': SIP: longer timeout for making call, shorter for cancelling
Merge commit 'd6d83279183db749de07bfdac79fe4180fc848d0' * commit 'd6d83279183db749de07bfdac79fe4180fc848d0': SIP: longer timeout for making call, shorter for cancelling