Merge commit '74c1194' into stratum

Conflicts:
	miner.c

miner.c

@@ -3768,7 +3768,7 @@ static bool block_exists(char *hexstr)
 /* Tests if this work is from a block that has been seen before */
 static inline bool from_existing_block(struct work *work)
 {
-	char *hexstr = bin2hex(work->data, 18);
+	char *hexstr = bin2hex(work->data + 8, 18);
 	bool ret;
 
 	if (unlikely(!hexstr)) {
@@ -3795,7 +3795,7 @@ static bool test_work_current(struct work *work)
 
 	uint32_t block_id = ((uint32_t*)(work->data))[1];
 
-	hexstr = bin2hex(&work->data[4], 18);
+	hexstr = bin2hex(work->data + 8, 18);
 	if (unlikely(!hexstr)) {
 		applog(LOG_ERR, "stage_thread OOM");
 		return ret;