display_name_address 1.9 fix
Merge branch 'patches-for-pdx' into yvr-update