Tree-Merge branch 'bfgminer-2.6.x' into bfgminer

Conflicts:
	NEWS
	configure.ac
	debian/changelog
	debian/control
	driver-opencl.c
	miner.c
	windows-build.txt