Duplicate (hidden) --userpass option before --pool-priority so it can be used in config files
Merge commit '3f21b2b' into bfgminer