Merge commit '68cd0e8' into bfgminer-2.6.x

Conflicts:
	miner.c

miner.c

@@ -2993,9 +2993,14 @@ int stale_wait(unsigned int mstime, struct work*work, bool checkend)
 	
 static void restart_threads(void)
 {
+	struct pool *cp = current_pool();
 	int i, fd;
 	struct thr_info *thr;
 
+	/* Artificially set the lagging flag to avoid pool not providing work
+	 * fast enough  messages after every long poll */
+	pool_tset(cp, &cp->lagging);
+
 	/* Discard staged work that is now stale */
 	discard_stale();