Merge commit '3f21b2b' into bfgminer-3.0.x

miner.c

@@ -1351,6 +1351,9 @@ static struct opt_table opt_config_table[] = {
 	OPT_WITHOUT_ARG("--per-device-stats",
 			opt_set_bool, &want_per_device_stats,
 			"Force verbose mode and output per-device statistics"),
+	OPT_WITH_ARG("--userpass|-O",  // duplicate to ensure config loads it before pool-priority
+	             set_userpass, NULL, NULL,
+	             opt_hidden),
 	OPT_WITH_ARG("--pool-priority",
 			 set_pool_priority, NULL, NULL,
 			 "Priority for just the previous-defined pool"),