Merge branch 'master' of github.com:gem/oq-engine into fix-blocksize-conservative
Merge branch 'fix-blocksize-conservative' of github.com:gem/oq-engine into fix-blocksize-conservative
Merge branch 'fix-blocksize-conservative' of github.com:gem/oq-engine into fix-blocksize-conservative
Mostly cosmetic changes