filter out non-version bits in block.nVersion in version comparisons
Merge branch 'merged-mining'