Don't display shipping address if shipping is disabled
Hide shipping address if shipping is disabled
Hide shipping address if shipping is disabled
Merge pull request #3815 from pmgarman/master

Don't display shipping address if shipping is disabled