Merge commit '17973c5' into cgmerges

Conflicts:
	API-README
	miner.php

API-README

@@ -389,6 +389,7 @@ Added API commands:
  'pgaidentify|N' (only works for BFL Singles so far)
 
 Modified API commands:
+ Change pool field name back from 'Diff1 Work' to 'Diff1 Shares'
  'devs' - add 'Difficulty Accepted', 'Difficulty Rejected',
               'Last Share Difficulty' to all devices
  'gpu|N' - add 'Difficulty Accepted', 'Difficulty Rejected',

api.c

@@ -1801,7 +1801,7 @@ static void poolstatus(__maybe_unused SOCKETTYPE c, __maybe_unused char *param,
 		root = api_add_uint(root, "Remote Failures", &(pool->remotefail_occasions), false);
 		root = api_add_escape(root, "User", pool->rpc_user, false);
 		root = api_add_time(root, "Last Share Time", &(pool->last_share_time), false);
-		root = api_add_int(root, "Diff1 Work", &(pool->diff1), false);
+		root = api_add_int(root, "Diff1 Shares", &(pool->diff1), false);
 		if (pool->rpc_proxy) {
 			root = api_add_escape(root, "Proxy", pool->rpc_proxy, false);
 		} else {