Merge branch 'master' of https://github.com/bitmaintech/cgminer.git
Merge branch 'master' of https://github.com/bitmaintech/cgminer.git