Fix for #2214.
Merge branch 'daniel_2214' into next
changing bind error message to be more descriptive
changing bind error message to be more descriptive
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Merge branch 'v1.12.x' into next
Merge branch 'sam_803_detemplatize' into next

Conflicts:
	src/clustering/immediate_consistency/branch/broadcaster.cc
Merge branch 'next' into sam_803_flags
Merge branch 'sam_803_flags' into next
Merge branch 'next' into sam_803_moreflags
Merge branch 'sam_803_moreflags' into next
Merge branch 'next' into sam_803_deinline