merge commit
merge commit

gem/oq-engine,gem/oq-engine,gem/oq-hazardlib,gem/oq-engine,gem/oq-hazardlib,gem/oq-engine,luisera/hmtk,gem/oq-engine,g-weatherill/hmtk,g-weatherill/hmtk,gem/oq-hazardlib,g-weatherill/hmtk,luisera/hmtk