Merge commit '39af50e' into v2

author Hraban Luyat <hraban@0brg.net>

Wed, 11 Jan 2017 00:01:16 +0000 (00:01 +0000)

committer Hraban Luyat <hraban@0brg.net>

Wed, 11 Jan 2017 00:01:16 +0000 (00:01 +0000)
author Hraban Luyat <hraban@0brg.net>
Wed, 11 Jan 2017 00:01:16 +0000 (00:01 +0000)
committer Hraban Luyat <hraban@0brg.net>
Wed, 11 Jan 2017 00:01:16 +0000 (00:01 +0000)
diff --cc encoder.go
Simple merge
diff --cc encoder_test.go
Simple merge
author	Hraban Luyat <hraban@0brg.net>
	Wed, 11 Jan 2017 00:01:16 +0000 (00:01 +0000)
committer	Hraban Luyat <hraban@0brg.net>
	Wed, 11 Jan 2017 00:01:16 +0000 (00:01 +0000)
		1	2
encoder.go	patch \|	diff1 \|	diff2 \|	blob \| history
encoder_test.go	patch \|	diff1 \|	diff2 \|	blob \| history