Merge branches 'master' and 'master' of github.com:ckolivas/cgminer