Python Driver v1.12.0-1
Fix for #1811 , might be improved.
More fixes for #1811.
fix for server_test.rb

Per mlucy the dispatch method has changed to take the token explicitly, so our tests have to change to match.
Do not have more than one outstanding CONTINUE request
Python driver 1.12.0-2
Merge commit '53e23c7' into HEAD

Conflicts:
	drivers/python/setup.py
Do not have more than one outstanding CONTINUE request

Related #2364
Review 1488 by @Tryneus
use MAKEFLAGS in build-rpm.sh
Fix 32 bit build

Closes #2324
Review 1484 by @srh
Do not use two different versions of protobuf
Fixes for thread safety, issue #1811
adding r.http to server, drivers, and tests
Merge branch 'v1.12.x' into next

Conflicts:
	drivers/python/rethinkdb/net.py
fixing clang warning and error cases in r.http
Merge pull request #2387 from eliangidoni/fix-1811

Fix for #1811 by @eliangidoni, reviewed by @danielmewes.
setting default user agent to 'RethinkDB'
adding default r.http auth type as 'basic'
adding new r.http tests
merging larkost/2390-remove-proto-buffers

Issue #2390 Remove the need for the proto-buffers ruby gem
Bypass the need to have the ruby proto-buffers gem installed in order to translate the master proto buffers file into a ruby hierarchy