Merge pull request #1081 from loiccouturier/master

Enhance stuff to add relay shipping mode
Fix shopping mode address directive