Merge branch zeusminer into bfgminer