Added flag to turn off bad-block checking
Merge branch 'master' into float_internals