Merge branch 'hotfix/v1.1.2'

Author: dancannon

.travis.yml

@@ -1,7 +1,5 @@
 language: go
 
-gobuild_args: -tags='cluster' -race
-
 go:
   - 1.4
   - 1.5
@@ -17,3 +15,5 @@ before_script:
   - rethinkdb --port-offset 1 --directory rethinkdb_data1 --join localhost:29016 > /dev/null 2>&1 &
   - rethinkdb --port-offset 2 --directory rethinkdb_data2 --join localhost:29016 > /dev/null 2>&1 &
   - rethinkdb --port-offset 3 --directory rethinkdb_data3 --join localhost:29016 > /dev/null 2>&1 &
+
+script: go test -tags='cluster' -race -check.vv -v ./...

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v1.1.2
+### Fixed
+ - Fixed issue when encoding some maps
+
 ## v1.1.1
 ### Fixed
  - Corrected protobuf import

encoding/encoding_test.go

@@ -0,0 +1,6 @@
+package encoding
+
+import (
+	// Import gocheck so that flag are setup (but unused)
+	_ "gopkg.in/check.v1"
+)

query_control.go

@@ -67,7 +67,7 @@ func Expr(val interface{}) Term {
 		switch valType.Kind() {
 		case reflect.Func:
 			return makeFunc(val)
-		case reflect.Struct, reflect.Ptr:
+		case reflect.Struct, reflect.Map, reflect.Ptr:
 			data, err := encode(val)
 
 			if err != nil || data == nil {