Merge commit '07605fa' into stratum

Conflicts:
	miner.c

miner.c

@@ -5174,6 +5174,7 @@ retry_stratum:
 		if (!auth_stratum(pool))
 			return false;
 		pool->idle = false;
+		pool->stratum_auth = true;
 		init_stratum_thread(pool);
 		return true;
 	}

util.c

@@ -1183,8 +1183,6 @@ out:
 	if (val)
 		json_decref(val);
 
-	pool->stratum_auth = ret;
-
 	return ret;
 }