Null-Merge commit 'bec40c5' into cg_merges_20131023a

Conflicts:
	Makefile.am
	NEWS
	README
	autogen.sh
	compat/Makefile.am
	configure.ac
	driver-bflsc.c
	driver-bflsc.h
	miner.c
	util.c