[skip hazardlib] Merge branch 'master' of github.com:gem/oq-engine
[skip hazardlib] Merge branch 'master' of github.com:gem/oq-engine


Former-commit-id: cfa842525de5255ad3a35ae1a9df592dec724dd1 [formerly cfa842525de5255ad3a35ae1a9df592dec724dd1 [formerly 05edc7765a8a839b20b4bfffd04068c0863ba1b0]]
Former-commit-id: 6be84df17b5eaa455cbd71edbc526712b66aed11
Former-commit-id: 9be410d279360b0989d44fe2ace8139e310277aa
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine