[skip CI] Merge branch 'master' of github.com:gem/oq-engine into flat-rup
[skip CI] Merge branch 'master' of github.com:gem/oq-engine into flat-rup


Former-commit-id: a865f7495ee73c55d542d1536167dacbecbdc06b [formerly 6c25725268ccf8c7abd4475c908dab34092c3b5e] [formerly 6c25725268ccf8c7abd4475c908dab34092c3b5e [formerly 6fff1800fdb15cf1fb21b66c193cda56adcf3067]]
Former-commit-id: 09206a433d54112a53e13654d85493ab9f886a88
Former-commit-id: 89061eacafddfd2d8a854c898e3ff311566615e5
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine