[skip CI]Merge branch 'master' into engine-3.6
[skip CI]Merge branch 'master' into engine-3.6


Former-commit-id: 203a02887797e106aa6cd550563e46121a2118c5 [formerly b72b347567df4993bfa3a114cbb92b17499f7bd1]
Former-commit-id: 5f2339ce28fadab0b14032f9bd526126b7fd454c
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine