Merge commit '9e10a6c' into bfgminer

Conflicts:
	driver-bitforce.c

driver-bitforce.c

@@ -451,6 +451,8 @@ static uint64_t bitforce_scanhash(struct thr_info *thr, struct work *work, uint6
 		sleep_time = bitforce->sleep_ms;
 		if (!restart_wait(sleep_time))
 		{}
+
+		bitforce->wait_ms += sleep_time;
 	}
 
 	if (ret)