stashing changes
Merge branch 'master' into URL-COOKIE
Trying to resolve URL vs COOKIE metro_ids

Occasionally seeing an odd redirect. Not sure why.
Merge branch 'URL-COOKIE'