Merge branch 'develop' into feature/contribution-guide-fix

shawncatz · web-flow · commit a8bd905d9d34 · 2017-03-19T16:05:50.000-07:00
diff --git a/binder.go b/binder.go
@@ -153,7 +153,12 @@ var (
 
 	PointerBinder = Binder{
 		Bind: func(params *Params, name string, typ reflect.Type) reflect.Value {
-			return Bind(params, name, typ.Elem()).Addr()
+			v := Bind(params, name, typ.Elem())
+			if v.CanAddr() {
+				return v.Addr()
+			}
+
+			return v
 		},
 		Unbind: func(output map[string]string, name string, val interface{}) {
 			Unbind(output, name, reflect.ValueOf(val).Elem().Interface())
