Merge branch 'next' into sam_no_program_options

Conflicts:
	configure
Merge branch 'sam_no_program_options' of github.com:rethinkdb/rethinkdb into sam_no_program_options