Local copy of telephone for patching
Applied patch
Merge branch 'james'