conflict resolving: Merge branch 'master-jan11-2013-phone-extention-fix'