diff -Nru golang-context-dev-0.0~git20140522.1.1f3e8a4/context.go golang-context-dev-0.0~git20140604.1.14f550f/context.go
--- golang-context-dev-0.0~git20140522.1.1f3e8a4/context.go	2014-05-22 22:03:43.000000000 +0000
+++ golang-context-dev-0.0~git20140604.1.14f550f/context.go	2014-06-04 16:11:50.000000000 +0000
@@ -30,9 +30,10 @@
 // Get returns a value stored for a given key in a given request.
 func Get(r *http.Request, key interface{}) interface{} {
 	mutex.RLock()
-	if data[r] != nil {
+	if ctx := data[r]; ctx != nil {
+		value := ctx[key]
 		mutex.RUnlock()
-		return data[r][key]
+		return value
 	}
 	mutex.RUnlock()
 	return nil
diff -Nru golang-context-dev-0.0~git20140522.1.1f3e8a4/debian/changelog golang-context-dev-0.0~git20140604.1.14f550f/debian/changelog
--- golang-context-dev-0.0~git20140522.1.1f3e8a4/debian/changelog	2014-08-08 10:33:26.000000000 +0000
+++ golang-context-dev-0.0~git20140604.1.14f550f/debian/changelog	2015-06-17 12:52:49.000000000 +0000
@@ -1,10 +1,15 @@
-golang-context-dev (0.0~git20140522.1.1f3e8a4-2~ubuntu0.14.04.1) trusty-proposed; urgency=medium
+golang-context-dev (0.0~git20140604.1.14f550f-1~ubuntu0.14.04.1) trusty; urgency=medium
 
-  [ Serge Hallyn ]
-   * Backport to Ubuntu 14.04 to support Docker SRU (LP: #1338768):
-     - Rename source package to golang-context-dev to align to 14.04.
+  * Backport to Ubuntu 14.04 to support Docker SRU (LP: #1454719).
+  * Rename source package to golang-context-dev to align to 14.04.
 
- -- James Page <james.page@ubuntu.com>  Fri, 08 Aug 2014 12:33:22 +0200
+ -- Robie Basak <robie.basak@ubuntu.com>  Wed, 17 Jun 2015 12:52:49 +0000
+
+golang-context (0.0~git20140604.1.14f550f-1) unstable; urgency=medium
+
+  * Upstream bump to 14f550f (2014-06-04)
+
+ -- Tianon Gravi <admwiggin@gmail.com>  Sat, 23 Aug 2014 22:26:27 -0400
 
 golang-context (0.0~git20140522.1.1f3e8a4-2) unstable; urgency=medium
 
diff -Nru golang-context-dev-0.0~git20140522.1.1f3e8a4/debian/control golang-context-dev-0.0~git20140604.1.14f550f/debian/control
--- golang-context-dev-0.0~git20140522.1.1f3e8a4/debian/control	2014-07-21 20:19:44.000000000 +0000
+++ golang-context-dev-0.0~git20140604.1.14f550f/debian/control	2015-06-17 12:52:48.000000000 +0000
@@ -1,10 +1,8 @@
 Source: golang-context-dev
 Section: devel
 Priority: extra
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Daniel Mizyrycki <mzdaniel@glidelink.net>
-Uploaders: Docker Packaging Team <docker-maint@lists.alioth.debian.org>,
-           Tianon Gravi <admwiggin@gmail.com>
+Maintainer: Tianon Gravi <admwiggin@gmail.com>
+Uploaders: Docker Packaging Team <docker-maint@lists.alioth.debian.org>
 Build-Depends: debhelper (>= 9), dh-golang, golang-go
 Standards-Version: 3.9.5
 Homepage: https://github.com/gorilla/context