Updating for latest path rules
Merge branch 'master' into appengine-proxy