Merge pull request #2071 from anandpdoshi/anand-august-18

[minor] Removed 'PIN: ' from default Address Template