Stubbed URIs didn't work under TeamCity. Using regexes instead of strings.
Merge branch 'master' into staging