Merge with veox sgminer

Merging to master/head