Fix the mailto link on othe map-flavors
Merge branch 'staging'