modules not to show if not products to display
Merge remote-tracking branch 'upstream/master'
fix for showing shipping address info
Merge remote-tracking branch 'upstream/master'