Merge branch 'tmm1-relative-sibling-import'

dependency/resolver.go

diff --git a/dependency/resolver.go b/dependency/resolver.go
index 45ffb53..16a7298 100644
--- a/dependency/resolver.go
+++ b/dependency/resolver.go
@@ -885,6 +885,12 @@
 		// https://blog.golang.org/the-app-engine-sdk-and-workspaces-gopath
 		info.Loc = LocAppengine
 		r.findCache[name] = info
+	} else if name == "context" {
+		// context is a package being added to the Go 1.7 standard library. Some
+		// packages, such as golang.org/x/net are importing it with build flags
+		// in files for go1.7. Need to detect this and handle it.
+		info.Loc = LocGoroot
+		r.findCache[name] = info
 	}
 
 	return info

tree/tree.go

diff --git a/tree/tree.go b/tree/tree.go
index 75be199..1d9def2 100644
--- a/tree/tree.go
+++ b/tree/tree.go
@@ -172,6 +172,11 @@
 		// where Google products are playing with each other.
 		// https://blog.golang.org/the-app-engine-sdk-and-workspaces-gopath
 		info.Loc = dependency.LocAppengine
+	} else if name == "context" {
+		// context is a package being added to the Go 1.7 standard library. Some
+		// packages, such as golang.org/x/net are importing it with build flags
+		// in files for go1.7. Need to detect this and handle it.
+		info.Loc = dependency.LocGoroot
 	}
 
 	return info