Extend context to include full URL with www stripped
Merge remote-tracking branch 'origin/hq'