Merge branch 'bugfix_slowsick' into bfgminer-2.5.x

Conflicts:
	miner.c

miner.c

@@ -5008,7 +5008,7 @@ static void *watchdog_thread(void __maybe_unused *userdata)
 			if (!strcmp(cgpu->api->dname, "cpu"))
 				continue;
 #endif
-			if (cgpu->rolling < WATCHDOG_LOW_HASH)
+			if (max(WATCHDOG_LOW_HASH, cgpu->rolling) < cgpu->total_mhashes / total_secs / 3)
 				cgpu->low_count++;
 			else
 				cgpu->low_count = 0;