Merge commit '4ab87d8' into bfgminer-2.6.x

Conflicts:
	driver-opencl.c

miner.c

@@ -4689,6 +4689,7 @@ void *miner_thread(void *userdata)
 				"mining thread %d", thr_id);
 			break;
 		}
+		cgpu->new_work = true;
 		requested = false;
 		gettimeofday(&tv_workstart, NULL);
 		work->blk.nonce = 0;

miner.h

@@ -410,6 +410,8 @@ struct cgpu_info {
 	double gpu_us_average;
 #endif
 
+	bool new_work;
+
 	float temp;
 	int cutofftemp;