removed bug caused by subdomain 'bridges'
Merge branch 'master' into staging